From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 9 Dec 2013 17:20:34 +0000 (+0200)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~2035^2~11
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=cc24ef09f8c050808f9f4989e49122b206e8c934;p=emacs.git

Merge from trunk.
---

cc24ef09f8c050808f9f4989e49122b206e8c934